* make-dist: Make a `site-lisp' directory in the distribution,

	instead of a `local-lisp' directory, which hasn't been the
	appropriate name for a long time.
	* Makefile.in (@rip_paths@locallisppath): Use site-lisp directory
	from the distribution first, then /usr/local/lib/emacs/site-lisp.

diff --git a/Makefile.in b/Makefile.in
index 65f4ccc6e6201a439137e6b6d0fc82dfe765b4ce..eec88c6ebc3d41077e8e1622cab73ca768c2718a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -166,7 +166,7 @@ buildlisppath=${srcdir}/lisp
 
 @rip_paths@lispdir=${srcdir}/lisp
 @rip_paths@externallispdir=${srcdir}/externallisp
-@rip_paths@locallisppath=${datadir}/emacs/site-lisp
+@rip_paths@locallisppath=${srcdir}/site-lisp:${datadir}/emacs/site-lisp
 @rip_paths@etcdir=${srcdir}/etc
 @rip_paths@lockdir=${srcdir}/lock
 @rip_paths@archlibdir=${srcdir}/lib-src

diff --git a/make-dist b/make-dist
index 6c4117a24393a6e98037d050028db1cc2acce517..e671cc0964c7972c2a2442c55b3e755f41fbe1b4 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -134,7 +134,7 @@ echo "Updating version number in README."
 echo "Creating subdirectories."
 # I think we're not going to distribute anything in external-lisp, so
 # I've removed it from this list.
-for subdir in lisp lisp/term local-lisp \
+for subdir in lisp lisp/term site-lisp \
              src src/m src/s src/bitmaps lib-src oldXMenu \
              etc lock cpp info man shortnames vms; do
   mkdir ${tempdir}/${subdir}